Fix #375893, patch by Ben Hague:

2007-11-28  Tor Lillqvist  <tml@novell.com>

	Fix #375893, patch by Ben Hague:

	* gtk/gtkfilesystemwin32.c (get_viewable_logical_drives): Wrapper
	around GetLogicalDrives() that takes also the viewable drive
	restrictions in the Registry (which are usually the result of an
	Active Directory Group Policy) into account.

	(check_volumes, gtk_file_system_win32_list_volumes) Call
	get_viewable_logical_drives() instead of GetLogicalDrives().

svn path=/trunk/; revision=19079

diff --git a/ChangeLog b/ChangeLog
index 414824e42c5598b82ae835464051c943926961dd..12f8d335a7a1b0a6b85f93f606c798fbf15af88c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-28  Tor Lillqvist  <tml@novell.com>
+
+       Fix #375893, patch by Ben Hague:
+
+       * gtk/gtkfilesystemwin32.c (get_viewable_logical_drives): Wrapper
+       around GetLogicalDrives() that takes also the viewable drive
+       restrictions in the Registry (which are usually the result of an
+       Active Directory Group Policy) into account.
+
+       (check_volumes, gtk_file_system_win32_list_volumes) Call
+       get_viewable_logical_drives() instead of GetLogicalDrives().
+
 2007-11-27  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_move_resize): Zero some

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index 31547b042aabed9c6c45b1c45138f14bfa3c35cb..55958eafe89bf4315bb22b29cc854b8c7d2dcc37 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -50,6 +50,7 @@
 #undef STRICT
 #include <shlobj.h>
 #include <shellapi.h>
+#include <winreg.h>
 
 #define BOOKMARKS_FILENAME ".gtk-bookmarks"
 
@@ -330,6 +331,51 @@ gtk_file_system_win32_iface_init (GtkFileSystemIface *iface)
   iface->set_bookmark_label = gtk_file_system_win32_set_bookmark_label;
 }
 
+/**
+ * get_viewable_logical_drives:
+ * 
+ * Returns the list of logical and viewable drives as defined by
+ * GetLogicalDrives() and the registry keys
+ * Software\Microsoft\Windows\CurrentVersion\Policies\Explorer under
+ * HKLM or HKCU. If neither key exists the result of
+ * GetLogicalDrives() is returned.
+ *
+ * Return value: bitmask with same meaning as returned by GetLogicalDrives()
+**/
+static guint32 
+get_viewable_logical_drives (void)
+{
+  guint viewable_drives = GetLogicalDrives ();
+  HKEY my_key;
+
+  DWORD var_type = REG_DWORD; //the value's a REG_DWORD type
+  DWORD no_drives_size = 4;
+  DWORD no_drives;
+  gboolean hklm_present = FALSE;
+
+  RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", 0, KEY_READ, &my_key);
+  if (RegQueryValueEx (my_key, "NoDrives", NULL, &var_type, &no_drives, &no_drives_size) == ERROR_SUCCESS)
+    {
+      // We need the bits that are set in viewable_drives, and unset in no_drives.
+      viewable_drives = viewable_drives & ~no_drives;
+      hklm_present = TRUE;
+    }
+
+  // If the key is present in HKLM then the one in HKCU should be ignored
+  if (!hklm_present)
+    {
+      RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", 0, KEY_READ, &my_key);
+    if (RegQueryValueEx (my_key, "NoDrives", NULL, &var_type, &no_drives, &no_drives_size) == ERROR_SUCCESS)
+      {
+       // We need the bits that are set in viewable_drives, and unset in no_drives.
+       viewable_drives = viewable_drives & ~no_drives;
+      }
+  }
+
+  RegCloseKey (my_key);
+  return viewable_drives; 
+}
+
 static gboolean
 check_volumes (gpointer data)
 {
@@ -337,10 +383,10 @@ check_volumes (gpointer data)
 
   g_return_val_if_fail (system_win32, FALSE);
 
-  if (system_win32->drives != GetLogicalDrives())
-               {
-                       g_signal_emit_by_name (system_win32, "volumes-changed", 0);
-               }
+  if (system_win32->drives != get_viewable_logical_drives ())
+    {
+      g_signal_emit_by_name (system_win32, "volumes-changed", 0);
+    }
 
   return TRUE;
 }
@@ -527,11 +573,11 @@ gtk_file_system_win32_list_volumes (GtkFileSystem *file_system)
   GSList *list = NULL;
   GtkFileSystemWin32 *system_win32 = (GtkFileSystemWin32 *)file_system;
 
-  drives = GetLogicalDrives();
+  drives = get_viewable_logical_drives ();
 
   system_win32->drives = drives;
   if (!drives)
-    g_warning ("GetLogicalDrives failed.");
+    g_warning ("get_viewable_logical_drives failed.");
 
   while (drives && drive[0] <= 'Z')
     {